Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] v1.16: Enable frozen_abi on banking trace file (backport of #33501) #33577

Closed
wants to merge 3 commits into from
Closed

[WIP] v1.16: Enable frozen_abi on banking trace file (backport of #33501) #33577

wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 7, 2023

This is an automatic backport of pull request #33501 done by Mergify.
Cherry-pick of 95810d8 has failed:

On branch mergify/bp/v1.16/pr-33501
Your branch is up to date with 'origin/v1.16'.

You are currently cherry-picking commit 95810d876a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/src/sigverify.rs
	modified:   frozen-abi/Cargo.toml
	modified:   frozen-abi/src/abi_digester.rs
	modified:   frozen-abi/src/abi_example.rs
	modified:   perf/Cargo.toml
	modified:   perf/build.rs
	modified:   perf/src/cuda_runtime.rs
	modified:   perf/src/lib.rs
	modified:   perf/src/packet.rs
	modified:   perf/src/recycler.rs
	modified:   programs/sbf/Cargo.lock
	modified:   sdk/src/packet.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   core/src/banking_trace.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@ryoqun @mergify
Enable frozen_abi on banking trace file (#33501)
1822022 
* Enable frozen_abi on banking trace file

* Fix ci with really correct bugfix...

* Remove tracker_callers

* Fix typo...

* Fix AbiExample for Arc/Rc's Weaks

* Added comment for AbiExample impl of SystemTime

* Simplify and document EvenAsOpaque with new usage

* Minor clean-ups

* Simplify SystemTime::example() with UNIX_EPOCH...

* Add comment for AbiExample subtleties

(cherry picked from commit 95810d8)

# Conflicts:
#	Cargo.lock
#	core/src/banking_trace.rs
@mergify mergify bot added the conflicts label Oct 7, 2023
@mergify mergify bot assigned ryoqun Oct 7, 2023
@ryoqun ryoqun changed the title v1.16: Enable frozen_abi on banking trace file (backport of #33501) [WIP] v1.16: Enable frozen_abi on banking trace file (backport of #33501) Oct 7, 2023
@codecov
Copy link

codecov bot commented Oct 7, 2023

Codecov Report

Merging #33577 (197a816) into v1.16 (197a816) will not change coverage.
The diff coverage is n/a.

❗ Current head 197a816 differs from pull request most recent head 3181c5e. Consider uploading reports for the commit 3181c5e to get more accurate results

@@           Coverage Diff           @@
##            v1.16   #33577   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         766      766           
  Lines      209028   209028           
=======================================
  Hits       171143   171143           
  Misses      37885    37885

@ryoqun ryoqun closed this Oct 14, 2023
@mergify mergify bot deleted the mergify/bp/v1.16/pr-33501 branch October 14, 2023 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ryoqun ryoqun

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ryoqun